Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-19051 improve respect for the offline trigger setting. #9602

Merged
merged 1 commit into from
Mar 16, 2017

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Dec 31, 2016

This adds a check for the setting to the checkTriggerViewPermission function and improves calls to check
settings to use the preferred Civi::settings method


@colemanw
Copy link
Member

@eileenmcnaughton can you pls rebase this one?

This adds a check for the setting to the checkTriggerViewPermission function and improves calls to check
settings to use the preferred Civi::settings method

Conflicts:
	CRM/Core/BAO/Log.php
@eileenmcnaughton
Copy link
Contributor Author

done

@eileenmcnaughton eileenmcnaughton merged commit 6d4aa46 into civicrm:master Mar 16, 2017
@eileenmcnaughton eileenmcnaughton deleted the triggers branch March 16, 2017 03:54
* @copyright CiviCRM LLC (c) 2004-2017
* $Id$
*
* @copyright CiviCRM LLC (c) 2004-2016
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The joy of late merges :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

argh - well spotted!

monishdeb pushed a commit to monishdeb/civicrm-core that referenced this pull request May 2, 2017
CRM-19051 improve respect for the offline trigger setting.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants